Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Oct 2011 05:50:59 +0000 (22:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Oct 2011 05:50:59 +0000 (22:50 -0700)
commit596d161d6015d019b49fd3d3c4536eff2606491d
tree722a6fbb6209957ccbd63e86ea6a822bf9bd9d89
parentce26f957a02ab557c385901f67d57cb2cd2dd9eb
parent831b90b09c42625faebbe50afa74d8632dae7b1e
Merge from trunk.
src/ChangeLog
src/window.c